*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cd42401d29738cef9b18129c4adc60c1079228a..354e8afeb28f6df880d5771274eca6e3b6c84f7d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -185,13 +185,8 @@
 
        * tumme.el (tumme-backward-image): Add prefix argument.  Add error
        when at first image.
-<<<<<<< ChangeLog
-       (tumme-forward-image): Add prefix argument.
-       Add error when at last image.
-=======
        (tumme-forward-image): Add prefix argument.  Add error when at last
        image.
->>>>>>> 1.9899
 
 2006-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>